From 61d50afcc6cdfffb2a13af20701b6aa9aee97792 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 31 May 2012 16:06:04 -0400 Subject: [PATCH] ChangeLog merge fix --- lisp/ChangeLog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d61aec0528f..7d49e4b5a2c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -19,12 +19,6 @@ * desktop.el (desktop-read): Clear previous and next buffers for all windows and bury *Messages* buffer (bug#11556). -2012-05-31 Eli Zaretskii - - * mail/sendmail.el (mail-yank-region): Recognize - rmail-yank-current-message in addition to insert-buffer. Fixes - mail-mode's "C-c C-r" that otherwise does nothing when invoked in - 2012-05-31 Stefan Monnier Add `declare' for `defun'. Align `defmacro's with it. -- 2.30.2